/*
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
package gonzalogarcia.subversion;

/**
 *
 * @author gonzalo
 */
//Codigo generado para crear el conflito
import java.util.*;
public class NewClass {
    
}



